[LLD][COFF] Call setLocation on DelayAddressChunk when inserting into the addresses vector (NFC) #124736
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the addresses vector This change prepares for ARM64X delay-load imports support (llvm#124600). Delaying the setLocation call is problematic on ARM64X because the order of addresses may not align with the order of symbols.
Member
|
@llvm/pr-subscribers-lld-coff @llvm/pr-subscribers-lld Author: Jacek Caban (cjacek) ChangesThis change prepares for ARM64X delay-load imports support (#124600). Delaying the Full diff: https://github.com/llvm/llvm-project/pull/124736.diff 1 Files Affected:
diff --git a/lld/COFF/DLL.cpp b/lld/COFF/DLL.cpp
index 534cd47be1051f..76b7bee0e77e32 100644
--- a/lld/COFF/DLL.cpp
+++ b/lld/COFF/DLL.cpp
@@ -927,6 +927,7 @@ void DelayLoadContents::create() {
Chunk *t = newThunkChunk(s, tm);
auto *a = make<DelayAddressChunk>(ctx, t);
addresses.push_back(a);
+ s->setLocation(a);
thunks.push_back(t);
StringRef extName = s->getExternalName();
if (extName.empty()) {
@@ -967,8 +968,6 @@ void DelayLoadContents::create() {
auxIatCopy.push_back(make<NullChunk>(ctx, 8));
}
- for (int i = 0, e = syms.size(); i < e; ++i)
- syms[i]->setLocation(addresses[base + i]);
auto *mh = make<NullChunk>(8, 8);
moduleHandles.push_back(mh);
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change prepares for ARM64X delay-load imports support (#124600). Delaying the
setLocationcall is problematic on ARM64X because the order of addresses may not align with the order of symbols.